Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 24 May 2010 12:00:00 +0000 (12:00 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 24 May 2010 12:00:00 +0000 (12:00 +0000)
commit2a77c33ad62fdf195c67d9e72daa937621a0400e
tree73df7231082cf42fd1c3b4fa7363f9ce9587d36b
parentcda701209fddd5b86f1382fd6036ef33091d3d44
parent037f82f07b1683fbdbe83b5b60d2b45cc6447146
Merge from mainline.